This is Josiah's Team1 git additions