Rearranged data structures a bit. Added a vector class, currently just an array list