[WIP] moving lots of shit around