Jssurf

Reorganized code running