Near v1 complete. Needs final cleanup.