[0.5] Resolves #30 (mostly).