Api

Will fix #2