Doors implementation
Merge branch 'doors' into develop