Continued work. Testing end of part 3.
Fixed the merge errors, javadocced most of it.