Statemap nearly finished