Adding Loader, GroupSystem, and updated engine
merge