fix importing issues and shit, while working in core
haven't run tests in standalone io for this commit yet