Chads branch

Fix the haxx