[Work In Progress] Adding points to hook into to allow better manipulation of the markup.

Instead of trying a hack to manipulate the markup, I am adding the proper hooks to allow for better manipulation of the markup to allow for adding different tags into the markup. This will allow for better extensions.