First class draft
Add debug