Semi working staging branch for PSE