Refactored schedule, starting roster builder