Genericise Surround Methods and add Basic Solver