Branch WIP

Working on a branch concept