Committing a round of changes to the custom features

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