wip on building next gen