/ work in progress, still tracking down locking bug