Made a (fresh) start with designing the component states and models.