WIP
fixed merge dorky things