Massive commit to hopefully correct three hours screwing up the repo