Refactoring (work in progress)

[uaktags]

There's been no updates in a month, almost all of the changes have been merged to my repo and pulled into the Refactoring branch.

Closing for now, thanks for all your help in this avenue!