Cleanup
Switch from .bind(this) to that=this idiom + persist storage partition across sessions