Added library calls for lists.
Made primitive class structure make more sense.