Refactor status parsing
Add status parsing tests
Refactor code. Use datastore directly on production.