markup is done... mostly