Update with a Status class

This should be easier to modify than the hashmap.