Adding locks - WIP...