Beginnings of a proper autoloader