Arrgh. Left testing code in briefly.