Debugging Phase 1 done, should pass all travis tests