Add/click layers maps 44

Opening early **DO NOT MERGE**