Minor refactors
Add fetch for loading
Put loading more generic
Refactor to use new way of loading
Minor changes