Finished

Finished code logic; missing javadoc.