Reverted to Enum for State, make it Parcelable

Talked with zzz and did more research, the overhead of Enum is minimal compared
to the benefits it provides.