add in other features that won't need to be covered in depth
Merged other stuff section with the branching section