ditched a generic parameter, huzzah