Merge pull request #1 from Polymore/composed

Breaking pieces further apart so that more can be composed