Forgot to test it after making breaking changes :) Also added some print statements so we know what's going on