Resolved #2: Combined getState and setState into state

This created a conflict for the property state, so that was renamed from 'state' to '_state'. That should be better practice/style anyway since we already have a getter and setter, and _state should be a private property.