added markup and to do list