added some stuff, fuck the autoloading