Add a little more text to implementation
Fix conflicts
Fix all the things