Revert "Issue #3 Debug"

This reverts commit f37a2d4cab3c664a9fa732dfbba259fa2dea3654.
Revert "Revert "Issue #3 Debug""

This reverts commit a23952d05555922cb952742ca469a67be8faa475.
All mixed up.