Get rid of mutable state
Bind queue to view model
fix snap to element refresh
Merge remote-tracking branch 'upstream/master'