New goal format now builds and passes tests