Work in progress
[endlessm/eos-shell#3425]