I liked the dictionary setup, so I made it in to a single item rather than a list. 

@mduan @divad12 Good compromise?