update naming scheme and approach for passing arguments. More flexibile and familiar to people who know ab