continued pre-0.0.1 work