WIP, Working on class heuristic but it's not working yet