Another big spike, should start testing soon...
Spikage, now with three whole unit tests!