Options!
Javadoccc'd

Also organised the classes a bit better.