New states

WIP for comment