Use lists instead of vectors

Allows for some simplification.