@jobara Should this component be moved into another file?