Finished refactoring and starting location story.