Too long since last commit

It was working, then I added the stuff to populate the list, and now I
get a null pointer exception. Should be fixed soon.