Update to latest working version

Aside from minor control to prevent undershooting (tweaking in progress) this version should function.