restructured maps and got subgoals working.