Ongoing. Implementing ginjection