Progress on Surge sample App