Feature/god resque