2nd draft - done with Matthias edits.... needs cleaning up