Initial solve(..) + tests in main