Ironing out some namespace stuff