Unblock

Please comment and review.
This entire file needs more `@log.(debug|warn|info|error)` logging!