Add debug mode, new carrier class, and some clean up