#2 : Starting to try to get namespace handling under control