Morning tweaking
Updated for feeding (singletons, connectable) to map.
Merge branch 'master' of https://github.com/jhirniak/pizza-for-students