Completed all TODOs required. Tests are passing