Custom states [wip]