Initial system
Fix merge conflicts