Trying to get SGD working
Fixup master