Added some variables for plumbing
Added bootState
Merge branch 'dev'