#26 WIP started lock resolution code into central place