Story 272 fix refactor that I forgot to do from previous story... whoops
Story 273 fix all the things!