started fixing dependant issue, needs test env
fixed recursive dependants
Merge branch 'dependant_fix'

Merging bugfix for dependants
verified merge, basic cleanup, push