Dunno what changes there are in here - git on Windows is a pain.
Will edit later.