Update 2.7

lots of stuff plus reorganizing