Commit 13

Added subgoals.  Used table to start iterating options.