working on standardizing the input of current parameters
preliminary tests run, looks like it works