Very initial work on markup