Created a Component wrapper for elements
Redoing everything, yolo