WORKING PASSED OFF

Still want to implement more JUnit tests