v0.4 prep work