Partial implementation of goals (issue #12)