jf: move shit where it goes