Wrapped h3 and switch

@quamilek @xliiv please review :)