updated most things to use just args instead of long lists of params