Finished!(?)

Comments out, tests are in, methods working…