Completed the core shortlist feature. Fixed #5