major refactor WIP
refactor wip
refactor wip
refactor wip
refactor wip
major refactor WIP
Merge branch '0.0.3-SNAPSHOT' into xcomposite