Adam's horrible changes to the repo ... I hope you all puke