More documentation
Starting switch over to ES for persistence