0.4.0

Less procedural.