solver still very much WIP