Features/short list

Merging in short list branch. Starting to feature-creep...