Remove TODOs
Add key parsing function
Dot notation for keys added!