Make stage and goal system
Merge branch 'develop'