Need to iron out some bugs
Merge branch 'master' of github.com:ksuarz/vdb