Ready for review to add javadoc, comments, and remove testing code