Ben: finishing up custom namespace