Dec 15

Almost fixed merge