I hope to finish this tomorrow, just a bunch of small changes left. Then ideally need to work around the rules that causes failures, but that's another task