Major changes across the board, adding clustering functionality and links