Major refactor to support a Future world