Updated to new client struct, barista core compiles, temp fix for locks.