New amalgamated dev branch with debug.py