Make methods static

Make the methods static, at least for now. I haven't quite decided on
what I want to do.
Clean up and make tests pass

Just clean up the old cruft, make two methods for now (calling the
methods directly), and make everything pass.