More refactoring. Started to move away from using parameters and using kwarg/dicts instead