everything works
finishing up javadocs and junit testing