Still working on it
Closes #1 (closed) #2 (closed) #3 (closed) #8 (closed)
This will create a new commit in order to revert the existing changes.
