markup in progress! still a good chunk to go!