Finished loaders and refactored a little bit