Groundwork for v0.0.5