Committing work on feature dependencies as well as resolving some things that should not have been included in the features

Signed-off-by: Gregg Coppen <gregg@iaminawe.com>