*edit shapes;
*refactoring
*more refactoring