Project 3 ish

not finished commenting, needs javadoc