pushing up to date work on solve and such so far