In a first round I will mainly focus on reworking existing shapes, but also adding a new one.