Last commit before nap, still shooting problem (maybe teams problem?)