WIP - Believe all GBF parts are in place
Need to fix heuristic