Refactor | Kyle and Bev | Remove error handling, added TODO for refactoring, deleted tests related to errors and adding to model