Nearly done
Conflict fixes
FINAL COMMIT