Wade into this pile of goo. Add tests, fix bugs, still way incomplete.
Merge branch 'master' of https://github.com/IanDarwin/javasrc