Huge edits in Runner class to support new shapes (no lighting yet)