Add Progress Graph
Fix invalid selector creation
Migrate to using makeSelector