replacing ugly, bulky Collection class with vectors