Reorganized/split callback handling
Added lock query capability
Fixed lock logic, removed ByteBuffer
removed extraneous import
Merge pull request #10 from palarson/jb

Reorganization of Callbacks and Lock request