need id and type here, or waiting on that?