Enable Hirb in dev/test
Increased navigability of associations between models
Updated TODO