Commit new branch

Need to merge this
@TimBurnham