Added in v0.1 stuff, broke it :-(