yup, would love to get rid of more legacy code.