Short sample solver working; needs cleanup