Updated hub based on recent work and Dec 18th meeting