Post #1520

Sadly, the changes are giving too many conflicts for me to finish the rebase tonight. Will continue tomorrow and expect some missing features here and there due to the need to completely refactor their codes.