Autowired

WIP