Gel steps

New pull request rebased from development.