Better Goal Structure

Changed the way to propose and log goals
Merge pull request #1 from cwendland/master

Better Goal Structure