Start reworking the way how various things are added to fit