WIP - Refactoring argument -> parameter in closures
WIP - Arugments <--> Parmeters fixes again