Everything in this system is now 100% working. Will begin the merge soon.