Completion integration

This PR has everything from Robert, Beau and myself with some merge conflict resolution and some minor improvements. IAPI will be code review off this PR so they can see everything in one place.