Create a first implementation without database
Save current work status
Merge stuff