Rework everything, prep for ESX integration.