WIP on new refactored version.