javadoc all the things!
started playing with a serializer saving scheme
merging