One step at a time.
Commits periodicly so i can revert if needed.