Testing is work in progress, this still has bugs!

Migrated from folder: dlock/dlock