Attempting to modularize dashboard stuff