Class Core State

Give a go to the implementation of a Core State object to see if the code would be improved.