Made composed lense understand block
Reimplemented composed with a block
Moved TODO's