All the changes
It works!
Revert "Cleaning up"

This reverts commit ed7bbf3dbfbb715178142999c59bc10971c8f376.
Merge branch 'develop'