Complete refactoring finished. Everything is FINALLY working as intended.