(refactor): ready for flux