orbitalkiller: shapes refactoring