wip
sole state working i think