Updated and partly working with mastertest-2.markup.