Cleanup/new methods/etc. Untested.