Refactoring, !HAD TO COMMIT WITH FAILING TESTS- OUT OF TIME EXCEPTION!