Major refactoring for increased clarity. Implements 90% of the required functionality.
This will create a new commit in order to revert the existing changes.
