Looks like everything is working
Fixed some formatting on the lock
Working lock merged in