wip
typos
Remove locking support for now, need new API