TEST
HUGE cleanup in home screen code