Add service factories
Begin implementing DI in services