WIP bringing some sanity