Added a class loader and fixed some stuff up