US26 Working on integration. This was me trying to get the pickers to remember last location. Tyler wanted this
Merge remote-tracking branch 'Master/Version-1.1' into Version-1.1