unclear. We shouldn't do large refactoring like this until there is good understanding where we are going.