Temp commit
Fix zoom, organise code