Final Everything - Just needs javadocs

Will finish it up.