Committed progress but stuff with autoloading aint right