Re-wrote some methods, using array of lists for faster retrieval, still some bugs to fix