Starting to merge old code back in and fix outdated things at the same time... it's not going so well. This is broken so DO NOT TRY TO RUN