Added Form and changed XML stuff