Still dead code, but has up and down functionality.
Merge remote-tracking branch 'origin/master'