Updates to Hyperlink class, starting to implement Hyperlink class throughout