Devise

Closes #33 and closes #22