continued with refactoring, worked on the sit theory exam use case methods today
fixed merge conflict