Checkpoint this imll before I make it less awful.
More tests and more helpers and shortcuts!