Add locking as a descreet feature, include business test