About to change a lot of code, so this is my backup of when things were still working.