Feature/flat map keys

First pass at FM keys