Finish off basic contents list implementation