Reset to static everything
Merge branch 'master' into old-state
"Revert back to static"