Added some rudimentary goal and trigger stuff