changed stuff over to new time input
Merge remote-tracking branch 'origin/braden' into gabis-gui