Recursive lock
Add classes for window
Add echo helper to utils
Fix typo