Added devise and user logic - WIP