initial pass at new approach to injection
Setup object injection instead of function injection
New function injection approach working! :-)