fixed all conflicts. refer to previous commit for comments. all working, but need to go over the schedule generator with K. Nice