Refactored a little and started the loader