Stubbed methods
completed all functions
Final commit before code review