Lots of changes

Working on main screen button for time, hooking that into data.