Changes to shape classes and loadscene