[inProgress] shapes refactoring