adding integrity locks to waterfall
bringing c# side back into sync