added basic devise stuff
merge