move map in to an inc file; add feedback