Refactored things to use data attributes rather than jquery fragments