Add/click layers maps 44

Opening early **DO NOT MERGE**
This is good moving the key building into a separate function, will work well with separate key config file