Finish working on XMLWrapper; will start work on commands