Added starter code, tests