v0.1 - Cleanup and implementations