Another todo crossed off the list
Change Vector to List/ArrayList
Merge branch 'vector2list' into develop
  required resolving merge conflicts with branch 'stmt2blocks'