First version of markup done.