lots of stuff: Mostly refactoring, abstracting, sucking at life, committing anyway.