Fixed namespaces, continued work on mapper.