Feature/optimize compose

Do _not_ merge. Update of working progress.