Work done in class
I have got it working for the top right corner