WIP: Preogress on refactoring