TODO: some internal triage for 0.3.0