Removed resque for now
Fixed up user bits