Beer xml

Final merge I believe.