Merge
Added javadocs for everything but commands, deleted a decent amount of
code