Comment by chameco

Yeah, the namespacing is somewhat poor, sorry about that. I'll get around to prefixing the names at some point.