Work on dep injection, still encoutering errors.