Yeah I'm going to go through and change these things but I didn't want to bite off too much in this branch