re-organized some stuff, wip wipw iwpiwpipw