cleaning up, and then a bunch of dicking around testing things