Incomplete commit. In process of making TIme slot an object, and static master time/conflict tables