WIP, trying to fix autoload