WIP, autoload but BC build