- Reverted a piece of last commit. I've found a better way of doing this.