#27 - Began adding support for goals.