Major Refactor; Finished User Story Location Already Taken.