Finished conversion... time to test

There are no unit tests yet.  There probably should be.