@talbs, is this good to go? (Now that the tests pass and everything?)