Just added some oop with moving shapes
Merge branch 'master' into OOP_start