Implement the basics
Fix merge