WIP
Resolve conflicts
Cleanup