got rid of the chained hash maps
cut back on the solver a bit more