Changes to clustering.  No more null values after clustering. Using arraylists.