merged jason and brit dashboard branch completely