Updating to have our own markup template.

Let's hope I didn't screw up things.