move some things around, **not compiling**
fixed build