Closes #1 on xapi-project/sm