Add some more parsing support over lunch