more first phase stuff
more shit
almost done w solver