Loader Refactor

Should work a bit better and be more consistent.