Finished

Finished code logic but missing javadoc