Continue cleaning up code/debugging stuff. Should be much closer to done.