Wrote more for the console class and some xml