Doing some refactoring because eclipse messed up this morning, also completed task 9