added pitch model and controller.  cleaned up merge conflicts