or actually not even be here? @brutski any comments on what is here based on your recent refactorings?