WIP - public refactoring