initial work on nested forms
Merge blaine and zach\'s map work
Fix map merge