Updated to a linked list - made use of itterators and this fancy stuff