Feature rewrite

Feature rewrite on top of the latest versions of Pushtape and Panopoly