Got client working again.
Cleaned up gradle build.
Added some tests.