Trying to add my wpf stuff but not looking good im afraid
merge conflicts laaame