WIP: Add debug