Starting rework

This will be a loooong journey.