Further work on new markdown parser