New Branch For Setpoints Created 9-9-14 By Simon Sutherington