working on solve() more