preparing to branch and add features