This unfortunately has broken the unit tests. Will have to worry about fixing them later. Everything seems to be working other than that.