[#44] started working on shape refactor