Closes #2: New Interface