First commit with solver