First commit, pieces still not functional, lots of junit to do
First commit, pieces still not functional, lots of junit to do