nit: Should probably get rid of this