New structure still not working
Done splitting time slots
Merge branch 'newtimeslots'