preparing to branch some features off