Mappings update, and start of pipe system

Incomplete - do not use