Using annotations, added goal prefix.

Some silly changes, just for trying pull requests...