Changed lots of things, added loader