Prettied up a bit.  C.go still fugly though