tons of changes preparing to use debugger everywhere..