Refactoring the loading cycle - now it's intuitive and idempotent