Added branches for refactor ideas/concepts