Reverted (only for now) to "single" mode for..

merge request..plus i'm not sure if it's worth having.