Move Computer state out of api