Code review done, about to make a new entity so storing the current working state