#58 Markup finished, images to be added