Intent API and little refactoring (closes #31)