Starting to rework old components and creating models