LOTS OF UNFINISHED CHANGES