Feature X ship list

Start working on Feature X which is to include:

[ ] Feature 1
[ ] Feature 2
[x] Feature 3