merge into master

moving some stuff around.