Update todos
Update TODO comments
Add basic structure for a locking server