I won't be able to do it anytime soon so I will include the states in my WIP form [@Jpp188]