Expansion goals and more efficient goal checking #19