Removing this from the sprint for now as it's not clear yet what the scope of this is. Will bring it in once it's clear.