Solver working! :) (TopoSort added + some small fixes)