Added Shift & Event to model

New classes added to model, will commit tests for model once complete