Put in an outline for the algorithms, added some more to the test framework