Pre TC Merge Commit

Just in case I somewhere screw everything up massively