Initial setup on v0.4.0, new approach/pattern