Added lenses
Started working on composite stages