Add goal functionality implemented
Resolve merge conflicts
Merge pull request #2 from chenhoward/add-goal

Add goal