Start of some rework