spun back to working version, have all sources in github