More additions to input stuff
Forgot to commit one file.
Beginning of XML/IO stuff