Continue work on gauge. references #77