Begun work on better xml decoding code.