Move things around
Disorganized work on getting dGdN stuff working