Continuing work on websharks/hubflow#1