changing all userName -> username (this happened in develop after I had started this branch, but I"m doing it again to minimize on merge conflicts)