Working on implementing DI correctly, server broken atm