Added ids to classes and updated functions to some work on the delegate matching