I see. Still feels like this could be cleaned up... but that could maybe be a future refactoring.