Begun cleaning up composition implementation.