Switched to a much simpler regex
Fixed so that it saves the className from the parent to the data-class so that we can restore it later. Probably a better way to do it, but this is quite dynamic
Moved the Objects to different files
Linked them to the html