Ooiion 1055

needs the ion-def pull request initiated by me to go in before this one.