More progress to Sperling, now works like task
Code cleanup and commenting