Refractored stuff and added basic Loader