Add back in parameters. Starting to get painful. Maybe now is the time to make the leap and use lenses?