v0.2 (major overhaul of v0.1)