add a little angular/di into the mix. WAT?