This week I continued working on gaf, the new xml loading is almost complete