Build issues fixed.  Now, with lots of @Inject guicy goodness