Update design, ensure that goal is tied to correct user
Merge pull request #18 from Egogre/design-updates

Update design, ensure that goal is tied to correct user