POC for sep refactor