Contextual

Contextual can be merged into develop branch back