Started adding solving logic