XNA update

Committing the XNA part (finally!) (hopefully...)