Major work on step 2 of the compose system