final commit. removed functionality to make passable project