Updated the Solver, it though I don't think it's completely functional yet