Ready to test
Add debug view