Work on new view and function component for events