Ongoing development

Starting to add JUnit classes