More WIP on debugging