adding plane controls
fixed merge conflict
pretty sky. pretty plane.