Begins adding composition code, and moves bodies to using it
Adds left out file