Added devise (half finished the job)