Remove broken print
Change lists of sub-things to be dictionaries
Add manual firing to simulation using client