Major rehaul of mapping and serving; hbt templating