Broke problem 2 apart

Added sub-goals and constraints