Issue 11 - Now all working

Now sitting at 81% test coverage. All statically typed Groovy - could not
stand working in Java any longer.

Change-Id: I59a062862cf3eb1e8c5b589233a86383f5059d40
Merge "Issue 11 - Now all working"