Forgot to actually move those functions in previous commit. And *argh*, don't commit things done for debugging!