#3: Added loader, highlights the need for some refactoring.