Get this closer to what it needs to be. Untested but was completely broken before.