Follow the tasty-auto way. Big refactor.