Additional work on goals (issue #12)