Got the powerup initial shape working and mass refacto