Tidied up code.
Added files.