Work in progress
Work in progress
Edit zone working properly now