wip/goattracker/patches
