Can we wrap all of these into issues so we can track independently