Major Debugging
===============
Too many changes to list