commit before branchin off to do a refactor