I fixed some argument problems I had by making them locals. Not super happy with the solution, but want to make progress