diff --git a/auth_options.go b/auth_options.go
index ec52f0b..46e55f9 100644
--- a/auth_options.go
+++ b/auth_options.go
@@ -85,6 +85,219 @@
 }
 
 func (opts AuthOptions) ToTokenV3CreateMap(scope *ScopeOptsV3) (map[string]interface{}, error) {
+	/*
+		type domainReq struct {
+			ID   *string `json:"id,omitempty"`
+			Name *string `json:"name,omitempty"`
+		}
+
+		type projectReq struct {
+			Domain *domainReq `json:"domain,omitempty"`
+			Name   *string    `json:"name,omitempty"`
+			ID     *string    `json:"id,omitempty"`
+		}
+
+		type userReq struct {
+			ID       *string    `json:"id,omitempty"`
+			Name     *string    `json:"name,omitempty"`
+			Password string     `json:"password"`
+			Domain   *domainReq `json:"domain,omitempty"`
+		}
+
+		type passwordReq struct {
+			User userReq `json:"user"`
+		}
+
+		type tokenReq struct {
+			ID string `json:"id"`
+		}
+
+		type identityReq struct {
+			Methods  []string     `json:"methods"`
+			Password *passwordReq `json:"password,omitempty"`
+			Token    *tokenReq    `json:"token,omitempty"`
+		}
+
+		type scopeReq struct {
+			Domain  *domainReq  `json:"domain,omitempty"`
+			Project *projectReq `json:"project,omitempty"`
+		}
+
+		type authReq struct {
+			Identity identityReq `json:"identity"`
+			Scope    *scopeReq   `json:"scope,omitempty"`
+		}
+
+		type request struct {
+			Auth authReq `json:"auth"`
+		}
+
+		// Populate the request structure based on the provided arguments. Create and return an error
+		// if insufficient or incompatible information is present.
+		var req request
+
+		// Test first for unrecognized arguments.
+		if options.APIKey != "" {
+			return createErr(ErrAPIKeyProvided)
+		}
+		if options.TenantID != "" {
+			return createErr(ErrTenantIDProvided)
+		}
+		if options.TenantName != "" {
+			return createErr(ErrTenantNameProvided)
+		}
+
+		if options.Password == "" {
+			if c.TokenID != "" {
+				// Because we aren't using password authentication, it's an error to also provide any of the user-based authentication
+				// parameters.
+				if options.Username != "" {
+					return createErr(ErrUsernameWithToken)
+				}
+				if options.UserID != "" {
+					return createErr(ErrUserIDWithToken)
+				}
+				if options.DomainID != "" {
+					return createErr(ErrDomainIDWithToken)
+				}
+				if options.DomainName != "" {
+					return createErr(ErrDomainNameWithToken)
+				}
+
+				// Configure the request for Token authentication.
+				req.Auth.Identity.Methods = []string{"token"}
+				req.Auth.Identity.Token = &tokenReq{
+					ID: c.TokenID,
+				}
+			} else {
+				// If no password or token ID are available, authentication can't continue.
+				return createErr(ErrMissingPassword)
+			}
+		} else {
+			// Password authentication.
+			req.Auth.Identity.Methods = []string{"password"}
+
+			// At least one of Username and UserID must be specified.
+			if options.Username == "" && options.UserID == "" {
+				return createErr(ErrUsernameOrUserID)
+			}
+
+			if options.Username != "" {
+				// If Username is provided, UserID may not be provided.
+				if options.UserID != "" {
+					return createErr(ErrUsernameOrUserID)
+				}
+
+				// Either DomainID or DomainName must also be specified.
+				if options.DomainID == "" && options.DomainName == "" {
+					return createErr(ErrDomainIDOrDomainName)
+				}
+
+				if options.DomainID != "" {
+					if options.DomainName != "" {
+						return createErr(ErrDomainIDOrDomainName)
+					}
+
+					// Configure the request for Username and Password authentication with a DomainID.
+					req.Auth.Identity.Password = &passwordReq{
+						User: userReq{
+							Name:     &options.Username,
+							Password: options.Password,
+							Domain:   &domainReq{ID: &options.DomainID},
+						},
+					}
+				}
+
+				if options.DomainName != "" {
+					// Configure the request for Username and Password authentication with a DomainName.
+					req.Auth.Identity.Password = &passwordReq{
+						User: userReq{
+							Name:     &options.Username,
+							Password: options.Password,
+							Domain:   &domainReq{Name: &options.DomainName},
+						},
+					}
+				}
+			}
+
+			if options.UserID != "" {
+				// If UserID is specified, neither DomainID nor DomainName may be.
+				if options.DomainID != "" {
+					return createErr(ErrDomainIDWithUserID)
+				}
+				if options.DomainName != "" {
+					return createErr(ErrDomainNameWithUserID)
+				}
+
+				// Configure the request for UserID and Password authentication.
+				req.Auth.Identity.Password = &passwordReq{
+					User: userReq{ID: &options.UserID, Password: options.Password},
+				}
+			}
+		}
+
+		// Add a "scope" element if a Scope has been provided.
+		if scope != nil {
+			if scope.ProjectName != "" {
+				// ProjectName provided: either DomainID or DomainName must also be supplied.
+				// ProjectID may not be supplied.
+				if scope.DomainID == "" && scope.DomainName == "" {
+					return createErr(ErrScopeDomainIDOrDomainName)
+				}
+				if scope.ProjectID != "" {
+					return createErr(ErrScopeProjectIDOrProjectName)
+				}
+
+				if scope.DomainID != "" {
+					// ProjectName + DomainID
+					req.Auth.Scope = &scopeReq{
+						Project: &projectReq{
+							Name:   &scope.ProjectName,
+							Domain: &domainReq{ID: &scope.DomainID},
+						},
+					}
+				}
+
+				if scope.DomainName != "" {
+					// ProjectName + DomainName
+					req.Auth.Scope = &scopeReq{
+						Project: &projectReq{
+							Name:   &scope.ProjectName,
+							Domain: &domainReq{Name: &scope.DomainName},
+						},
+					}
+				}
+			} else if scope.ProjectID != "" {
+				// ProjectID provided. ProjectName, DomainID, and DomainName may not be provided.
+				if scope.DomainID != "" {
+					return createErr(ErrScopeProjectIDAlone)
+				}
+				if scope.DomainName != "" {
+					return createErr(ErrScopeProjectIDAlone)
+				}
+
+				// ProjectID
+				req.Auth.Scope = &scopeReq{
+					Project: &projectReq{ID: &scope.ProjectID},
+				}
+			} else if scope.DomainID != "" {
+				// DomainID provided. ProjectID, ProjectName, and DomainName may not be provided.
+				if scope.DomainName != "" {
+					return createErr(ErrScopeDomainIDOrDomainName)
+				}
+
+				// DomainID
+				req.Auth.Scope = &scopeReq{
+					Domain: &domainReq{ID: &scope.DomainID},
+				}
+			} else if scope.DomainName != "" {
+				return createErr(ErrScopeDomainName)
+			} else {
+				return createErr(ErrScopeEmpty)
+			}
+		}
+	*/
+
 	var methods []string
 	if opts.TokenID != "" {
 		methods = []string{"token"}
@@ -133,12 +346,6 @@
 	if err != nil {
 		return nil, err
 	}
-	/*
-		if opts.TokenID == "" {
-			delete(b["auth"].(map[string]interface{}), "token")
-			return b, nil
-		}
 
-		delete(b["auth"].(map[string]interface{}), "passwordCredentials")*/
 	return b, nil
 }
diff --git a/authv3.go b/authv3.go
index 470e495..3099b95 100644
--- a/authv3.go
+++ b/authv3.go
@@ -38,7 +38,7 @@
 	ID       string    `json:"id,omitempty" xor:"Name"`
 	Name     string    `json:"name,omitempty" xor:"ID"`
 	Password string    `json:"password" required:"true"`
-	Domain   *DomainV3 `json:"domain,omitempty" not:"Domain.ID,Domain.Name"`
+	Domain   *DomainV3 `json:"domain,omitempty"`
 }
 
 type PasswordCredentialsV3 struct {
diff --git a/openstack/networking/v2/extensions/external/requests.go b/openstack/networking/v2/extensions/external/requests.go
index f626f66..1ee39d2 100644
--- a/openstack/networking/v2/extensions/external/requests.go
+++ b/openstack/networking/v2/extensions/external/requests.go
@@ -10,7 +10,7 @@
 // and optional fields, with the addition of the External field.
 type CreateOpts struct {
 	networks.CreateOpts
-	External *bool `json:"router:extenal,omitempty"`
+	External *bool `json:"router:external,omitempty"`
 }
 
 // ToNetworkCreateMap casts a CreateOpts struct to a map.
@@ -22,8 +22,8 @@
 // resources. It embeds networks.UpdateOpts and so inherits all of its required
 // and optional fields, with the addition of the External field.
 type UpdateOpts struct {
-	Parent   networks.UpdateOpts
-	External *bool `json:"router:extenal,omitempty"`
+	networks.UpdateOpts
+	External *bool `json:"router:external,omitempty"`
 }
 
 // ToNetworkUpdateMap casts an UpdateOpts struct to a map.
diff --git a/openstack/networking/v2/extensions/external/results_test.go b/openstack/networking/v2/extensions/external/results_test.go
index 8e5200a..5187d2e 100644
--- a/openstack/networking/v2/extensions/external/results_test.go
+++ b/openstack/networking/v2/extensions/external/results_test.go
@@ -10,6 +10,7 @@
 	"github.com/gophercloud/gophercloud/pagination"
 	th "github.com/gophercloud/gophercloud/testhelper"
 	fake "github.com/gophercloud/gophercloud/testhelper/client"
+	"github.com/rackspace/gophercloud"
 )
 
 func TestList(t *testing.T) {
@@ -174,7 +175,7 @@
 		`)
 	})
 
-	options := CreateOpts{networks.CreateOpts{Name: "ext_net", AdminStateUp: Up}, true}
+	options := CreateOpts{networks.CreateOpts{Name: "ext_net", AdminStateUp: gophercloud.Enabled}, gophercloud.Enabled}
 	res := networks.Create(fake.ServiceClient(), options)
 
 	n, err := ExtractCreate(res)
@@ -222,7 +223,7 @@
 		`)
 	})
 
-	options := UpdateOpts{networks.UpdateOpts{Name: "new_name"}, true}
+	options := UpdateOpts{networks.UpdateOpts{Name: "new_name"}, gophercloud.Enabled}
 	res := networks.Update(fake.ServiceClient(), "4e8e5957-649f-477b-9e5b-f1f75b21c03c", options)
 	n, err := ExtractUpdate(res)
 
diff --git a/openstack/networking/v2/extensions/fwaas/firewalls/requests_test.go b/openstack/networking/v2/extensions/fwaas/firewalls/requests_test.go
index 515dfbd..92c4e4c 100644
--- a/openstack/networking/v2/extensions/fwaas/firewalls/requests_test.go
+++ b/openstack/networking/v2/extensions/fwaas/firewalls/requests_test.go
@@ -8,6 +8,7 @@
 	fake "github.com/gophercloud/gophercloud/openstack/networking/v2/common"
 	"github.com/gophercloud/gophercloud/pagination"
 	th "github.com/gophercloud/gophercloud/testhelper"
+	"github.com/jrperritt/gophercloud"
 )
 
 func TestURLs(t *testing.T) {
@@ -137,7 +138,7 @@
 		TenantID:     "b4eedccc6fb74fa8a7ad6b08382b852b",
 		Name:         "fw",
 		Description:  "OpenStack firewall",
-		AdminStateUp: Up,
+		AdminStateUp: gophercloud.Enabled,
 		PolicyID:     "19ab8c87-4a32-4e6a-a74e-b77fffb89a0c",
 	}
 	_, err := Create(fake.ServiceClient(), options).Extract()
@@ -223,7 +224,7 @@
 	options := UpdateOpts{
 		Name:         "fw",
 		Description:  "updated fw",
-		AdminStateUp: Down,
+		AdminStateUp: gophercloud.Disabled,
 		PolicyID:     "19ab8c87-4a32-4e6a-a74e-b77fffb89a0c",
 	}
 
diff --git a/openstack/networking/v2/extensions/fwaas/policies/requests_test.go b/openstack/networking/v2/extensions/fwaas/policies/requests_test.go
index d0d83d0..23d6a66 100644
--- a/openstack/networking/v2/extensions/fwaas/policies/requests_test.go
+++ b/openstack/networking/v2/extensions/fwaas/policies/requests_test.go
@@ -5,6 +5,7 @@
 	"net/http"
 	"testing"
 
+	"github.com/gophercloud/gophercloud"
 	fake "github.com/gophercloud/gophercloud/openstack/networking/v2/common"
 	"github.com/gophercloud/gophercloud/pagination"
 	th "github.com/gophercloud/gophercloud/testhelper"
@@ -154,8 +155,8 @@
 		TenantID:    "9145d91459d248b1b02fdaca97c6a75d",
 		Name:        "policy",
 		Description: "Firewall policy",
-		Shared:      No,
-		Audited:     Yes,
+		Shared:      gophercloud.Disabled,
+		Audited:     gophercloud.Enabled,
 		Rules: []string{
 			"98a58c87-76be-ae7c-a74e-b77fffb88d95",
 			"11a58c87-76be-ae7c-a74e-b77fffb88a32",
diff --git a/openstack/networking/v2/extensions/fwaas/rules/requests.go b/openstack/networking/v2/extensions/fwaas/rules/requests.go
index c6b3b97..9e9d36e 100644
--- a/openstack/networking/v2/extensions/fwaas/rules/requests.go
+++ b/openstack/networking/v2/extensions/fwaas/rules/requests.go
@@ -5,18 +5,6 @@
 	"github.com/gophercloud/gophercloud/pagination"
 )
 
-// Binary gives users a solid type to work with for create and update
-// operations. It is recommended that users use the `Yes` and `No` enums
-type Binary *bool
-
-// Convenience vars for Enabled and Shared values.
-var (
-	iTrue         = true
-	iFalse        = false
-	Yes    Binary = &iTrue
-	No     Binary = &iFalse
-)
-
 // ListOptsBuilder allows extensions to add additional parameters to the
 // List request.
 type ListOptsBuilder interface {
@@ -136,17 +124,17 @@
 
 // UpdateOpts contains the values used when updating a firewall rule.
 type UpdateOpts struct {
-	Protocol             string                `json:"protocol,omitempty"`
-	Action               string                `json:"action,omitempty"`
-	Name                 string                `json:"name,omitempty"`
-	Description          string                `json:"description,omitempty"`
-	IPVersion            gophercloud.IPVersion `json:"ip_version,omitempty"`
-	SourceIPAddress      string                `json:"source_ip_address,omitempty"`
-	DestinationIPAddress string                `json:"destination_ip_address,omitempty"`
-	SourcePort           string                `json:"source_port,omitempty"`
-	DestinationPort      string                `json:"destination_port,omitempty"`
-	Shared               *bool                 `json:"shared,omitempty"`
-	Enabled              *bool                 `json:"enabled,omitempty"`
+	Protocol             *string                `json:"protocol,omitempty"`
+	Action               *string                `json:"action,omitempty"`
+	Name                 *string                `json:"name,omitempty"`
+	Description          *string                `json:"description,omitempty"`
+	IPVersion            *gophercloud.IPVersion `json:"ip_version,omitempty"`
+	SourceIPAddress      *string                `json:"source_ip_address,omitempty"`
+	DestinationIPAddress *string                `json:"destination_ip_address,omitempty"`
+	SourcePort           *string                `json:"source_port,omitempty"`
+	DestinationPort      *string                `json:"destination_port,omitempty"`
+	Shared               *bool                  `json:"shared,omitempty"`
+	Enabled              *bool                  `json:"enabled,omitempty"`
 }
 
 // ToRuleUpdateMap casts a UpdateOpts struct to a map.
diff --git a/openstack/networking/v2/extensions/fwaas/rules/requests_test.go b/openstack/networking/v2/extensions/fwaas/rules/requests_test.go
index ae9b552..79c0c2d 100644
--- a/openstack/networking/v2/extensions/fwaas/rules/requests_test.go
+++ b/openstack/networking/v2/extensions/fwaas/rules/requests_test.go
@@ -8,6 +8,7 @@
 	fake "github.com/gophercloud/gophercloud/openstack/networking/v2/common"
 	"github.com/gophercloud/gophercloud/pagination"
 	th "github.com/gophercloud/gophercloud/testhelper"
+	"github.com/jrperritt/gophercloud"
 )
 
 func TestURLs(t *testing.T) {
@@ -258,8 +259,6 @@
 		"description": "ssh rule",
 		"destination_ip_address": "192.168.1.0/24",
 		"destination_port": "22",
-		"source_ip_address": null,
-		"source_port": null,
 		"name": "ssh_form_any",
 		"action": "allow",
 		"enabled": false
@@ -275,8 +274,6 @@
 	"firewall_rule":{
 		"protocol": "tcp",
 		"description": "ssh rule",
-		"source_port": null,
-		"source_ip_address": null,
 		"destination_ip_address": "192.168.1.0/24",
 		"firewall_policy_id": "e2a5fb51-698c-4898-87e8-f1eee6b50919",
 		"position": 2,
@@ -293,20 +290,21 @@
 		`)
 	})
 
-	destinationIPAddress := "192.168.1.0/24"
-	destinationPort := "22"
-	empty := ""
+	newProtocol := "tcp"
+	newDescription := "ssh rule"
+	newDestinationIP := "192.168.1.0/24"
+	newDestintionPort := "22"
+	newName := "ssh_form_any"
+	newAction := "allow"
 
 	options := UpdateOpts{
-		Protocol:             "tcp",
-		Description:          "ssh rule",
-		DestinationIPAddress: &destinationIPAddress,
-		DestinationPort:      &destinationPort,
-		Name:                 "ssh_form_any",
-		SourceIPAddress:      &empty,
-		SourcePort:           &empty,
-		Action:               "allow",
-		Enabled:              No,
+		Protocol:             &newProtocol,
+		Description:          &newDescription,
+		DestinationIPAddress: &newDestinationIP,
+		DestinationPort:      &newDestintionPort,
+		Name:                 &newName,
+		Action:               &newAction,
+		Enabled:              gophercloud.Disabled,
 	}
 
 	_, err := Update(fake.ServiceClient(), "f03bd950-6c56-4f5e-a307-45967078f507", options).Extract()
diff --git a/openstack/networking/v2/extensions/layer3/floatingips/requests.go b/openstack/networking/v2/extensions/layer3/floatingips/requests.go
index ade033a..9805b56 100644
--- a/openstack/networking/v2/extensions/layer3/floatingips/requests.go
+++ b/openstack/networking/v2/extensions/layer3/floatingips/requests.go
@@ -113,7 +113,7 @@
 // linked to. To associate the floating IP with a new internal port, provide its
 // ID. To disassociate the floating IP from all ports, provide an empty string.
 type UpdateOpts struct {
-	PortID string `json:"port_id,omitempty"`
+	PortID string `json:"port_id"`
 }
 
 // ToFloatingIPUpdateMap allows UpdateOpts to satisfy the UpdateOptsBuilder
diff --git a/openstack/networking/v2/extensions/layer3/floatingips/requests_test.go b/openstack/networking/v2/extensions/layer3/floatingips/requests_test.go
index 069a6d0..3e9a91f 100644
--- a/openstack/networking/v2/extensions/layer3/floatingips/requests_test.go
+++ b/openstack/networking/v2/extensions/layer3/floatingips/requests_test.go
@@ -310,7 +310,7 @@
 		th.TestJSONRequest(t, r, `
 {
     "floatingip": {
-      "port_id": null
+      "port_id": ""
     }
 }
       `)
diff --git a/openstack/networking/v2/extensions/layer3/routers/requests.go b/openstack/networking/v2/extensions/layer3/routers/requests.go
index d041d45..f2fa073 100644
--- a/openstack/networking/v2/extensions/layer3/routers/requests.go
+++ b/openstack/networking/v2/extensions/layer3/routers/requests.go
@@ -94,7 +94,7 @@
 	AdminStateUp *bool        `json:"admin_state_up,omitempty"`
 	Distributed  *bool        `json:"distributed,omitempty"`
 	GatewayInfo  *GatewayInfo `json:"external_gateway_info,omitempty"`
-	Routes       []Route      `json:"routes,omitempty"`
+	Routes       []Route      `json:"routes"`
 }
 
 func (opts UpdateOpts) ToRouterUpdateMap() (map[string]interface{}, error) {
@@ -135,8 +135,8 @@
 // AddInterfaceOpts allow you to work with operations that either add
 // an internal interface from a router.
 type AddInterfaceOpts struct {
-	SubnetID string `json:"subnet_id" xor:"PortID"`
-	PortID   string `json:"port_id" xor:"SubnetID"`
+	SubnetID string `json:"subnet_id,omitempty" xor:"PortID"`
+	PortID   string `json:"port_id,omitempty" xor:"SubnetID"`
 }
 
 // ToRouterAddInterfaceMap allows InterfaceOpts to satisfy the InterfaceOptsBuilder
@@ -188,8 +188,8 @@
 // RemoveInterfaceOpts allow you to work with operations that either add or remote
 // an internal interface from a router.
 type RemoveInterfaceOpts struct {
-	SubnetID string `json:"subnet_id" or:"PortID"`
-	PortID   string `json:"port_id" or:"SubnetID"`
+	SubnetID string `json:"subnet_id,omitempty" or:"PortID"`
+	PortID   string `json:"port_id,omitempty" or:"SubnetID"`
 }
 
 // ToRouterRemoveInterfaceMap allows RemoveInterfaceOpts to satisfy the RemoveInterfaceOptsBuilder
diff --git a/openstack/networking/v2/extensions/layer3/routers/requests_test.go b/openstack/networking/v2/extensions/layer3/routers/requests_test.go
index d4ac371..c6cd7b3 100644
--- a/openstack/networking/v2/extensions/layer3/routers/requests_test.go
+++ b/openstack/networking/v2/extensions/layer3/routers/requests_test.go
@@ -353,7 +353,7 @@
 `)
 	})
 
-	opts := InterfaceOpts{SubnetID: "a2f1f29d-571b-4533-907f-5803ab96ead1"}
+	opts := AddInterfaceOpts{SubnetID: "a2f1f29d-571b-4533-907f-5803ab96ead1"}
 	res, err := AddInterface(fake.ServiceClient(), "4e8e5957-649f-477b-9e5b-f1f75b21c03c", opts).Extract()
 	th.AssertNoErr(t, err)
 
@@ -364,11 +364,11 @@
 }
 
 func TestAddInterfaceRequiredOpts(t *testing.T) {
-	_, err := AddInterface(fake.ServiceClient(), "foo", InterfaceOpts{}).Extract()
+	_, err := AddInterface(fake.ServiceClient(), "foo", AddInterfaceOpts{}).Extract()
 	if err == nil {
 		t.Fatalf("Expected error, got none")
 	}
-	_, err = AddInterface(fake.ServiceClient(), "foo", InterfaceOpts{SubnetID: "bar", PortID: "baz"}).Extract()
+	_, err = AddInterface(fake.ServiceClient(), "foo", AddInterfaceOpts{SubnetID: "bar", PortID: "baz"}).Extract()
 	if err == nil {
 		t.Fatalf("Expected error, got none")
 	}
@@ -402,7 +402,7 @@
 `)
 	})
 
-	opts := InterfaceOpts{SubnetID: "a2f1f29d-571b-4533-907f-5803ab96ead1"}
+	opts := RemoveInterfaceOpts{SubnetID: "a2f1f29d-571b-4533-907f-5803ab96ead1"}
 	res, err := RemoveInterface(fake.ServiceClient(), "4e8e5957-649f-477b-9e5b-f1f75b21c03c", opts).Extract()
 	th.AssertNoErr(t, err)
 
diff --git a/openstack/networking/v2/extensions/lbaas/members/requests.go b/openstack/networking/v2/extensions/lbaas/members/requests.go
index 9388a10..00c1144 100644
--- a/openstack/networking/v2/extensions/lbaas/members/requests.go
+++ b/openstack/networking/v2/extensions/lbaas/members/requests.go
@@ -90,7 +90,7 @@
 // UpdateOpts contains the values used when updating a pool member.
 type UpdateOpts struct {
 	// The administrative state of the member, which is up (true) or down (false).
-	AdminStateUp bool `json:"admin_state_up,omitempty"`
+	AdminStateUp *bool `json:"admin_state_up,omitempty"`
 }
 
 func (opts UpdateOpts) ToLBMemberUpdateMap() (map[string]interface{}, error) {
diff --git a/openstack/networking/v2/extensions/lbaas/members/requests_test.go b/openstack/networking/v2/extensions/lbaas/members/requests_test.go
index 000a79b..cea1f05 100644
--- a/openstack/networking/v2/extensions/lbaas/members/requests_test.go
+++ b/openstack/networking/v2/extensions/lbaas/members/requests_test.go
@@ -8,6 +8,7 @@
 	fake "github.com/gophercloud/gophercloud/openstack/networking/v2/common"
 	"github.com/gophercloud/gophercloud/pagination"
 	th "github.com/gophercloud/gophercloud/testhelper"
+	"github.com/jrperritt/gophercloud"
 )
 
 func TestURLs(t *testing.T) {
@@ -222,7 +223,7 @@
     `)
 	})
 
-	options := UpdateOpts{AdminStateUp: false}
+	options := UpdateOpts{AdminStateUp: gophercloud.Disabled}
 
 	_, err := Update(fake.ServiceClient(), "332abe93-f488-41ba-870b-2ac66be7f853", options).Extract()
 	th.AssertNoErr(t, err)
diff --git a/openstack/networking/v2/extensions/lbaas/vips/requests.go b/openstack/networking/v2/extensions/lbaas/vips/requests.go
index 52f167d..e148843 100644
--- a/openstack/networking/v2/extensions/lbaas/vips/requests.go
+++ b/openstack/networking/v2/extensions/lbaas/vips/requests.go
@@ -126,11 +126,11 @@
 // be updated.
 type UpdateOpts struct {
 	// Human-readable name for the VIP. Does not have to be unique.
-	Name string `json:"name" required:"true"`
+	Name *string `json:"name,omitempty"`
 	// The ID of the pool with which the VIP is associated.
-	PoolID string `json:"pool_id" required:"true"`
+	PoolID *string `json:"pool_id,omitempty"`
 	// Human-readable description for the VIP.
-	Description string `json:"description"`
+	Description *string `json:"description,omitempty"`
 	// Omit this field to prevent session persistence.
 	Persistence *SessionPersistence `json:"session_persistence,omitempty"`
 	// The maximum number of connections allowed for the VIP.
diff --git a/openstack/networking/v2/extensions/lbaas/vips/requests_test.go b/openstack/networking/v2/extensions/lbaas/vips/requests_test.go
index 6b1b92b..de7a1b6 100644
--- a/openstack/networking/v2/extensions/lbaas/vips/requests_test.go
+++ b/openstack/networking/v2/extensions/lbaas/vips/requests_test.go
@@ -8,6 +8,7 @@
 	fake "github.com/gophercloud/gophercloud/openstack/networking/v2/common"
 	"github.com/gophercloud/gophercloud/pagination"
 	th "github.com/gophercloud/gophercloud/testhelper"
+	"github.com/jrperritt/gophercloud"
 )
 
 func TestURLs(t *testing.T) {
@@ -172,7 +173,7 @@
 	opts := CreateOpts{
 		Protocol:     "HTTP",
 		Name:         "NewVip",
-		AdminStateUp: Up,
+		AdminStateUp: gophercloud.Enabled,
 		SubnetID:     "8032909d-47a1-4715-90af-5153ffe39861",
 		PoolID:       "61b1f87a-7a21-4ad3-9dda-7f81d249944f",
 		ProtocolPort: 80,
diff --git a/openstack/networking/v2/extensions/provider/results_test.go b/openstack/networking/v2/extensions/provider/results_test.go
index 59f06cc..2168123 100644
--- a/openstack/networking/v2/extensions/provider/results_test.go
+++ b/openstack/networking/v2/extensions/provider/results_test.go
@@ -9,6 +9,7 @@
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/networks"
 	"github.com/gophercloud/gophercloud/pagination"
 	th "github.com/gophercloud/gophercloud/testhelper"
+	"github.com/rackspace/gophercloud"
 )
 
 func TestList(t *testing.T) {
@@ -187,7 +188,7 @@
 		`)
 	})
 
-	options := networks.CreateOpts{Name: "sample_network", AdminStateUp: Up}
+	options := networks.CreateOpts{Name: "sample_network", AdminStateUp: gophercloud.Enabled}
 	res := networks.Create(fake.ServiceClient(), options)
 	n, err := ExtractCreate(res)
 
@@ -241,7 +242,7 @@
 	})
 
 	iTrue := true
-	options := networks.UpdateOpts{Name: "new_network_name", AdminStateUp: Down, Shared: &iTrue}
+	options := networks.UpdateOpts{Name: "new_network_name", AdminStateUp: gophercloud.Disabled, Shared: &iTrue}
 	res := networks.Update(fake.ServiceClient(), "4e8e5957-649f-477b-9e5b-f1f75b21c03c", options)
 	n, err := ExtractUpdate(res)
 
diff --git a/openstack/networking/v2/extensions/security/groups/requests.go b/openstack/networking/v2/extensions/security/groups/requests.go
index 5211a14..42a45e4 100644
--- a/openstack/networking/v2/extensions/security/groups/requests.go
+++ b/openstack/networking/v2/extensions/security/groups/requests.go
@@ -56,7 +56,7 @@
 // security group rules for the IPv4 and IPv6 ether types.
 func Create(c *gophercloud.ServiceClient, opts CreateOptsBuilder) CreateResult {
 	var r CreateResult
-	b, err := opts.ToSubnetCreateMap()
+	b, err := opts.ToSecGroupCreateMap()
 	if err != nil {
 		r.Err = err
 		return r
diff --git a/openstack/networking/v2/extensions/security/rules/requests.go b/openstack/networking/v2/extensions/security/rules/requests.go
index 8344718..d93f470 100644
--- a/openstack/networking/v2/extensions/security/rules/requests.go
+++ b/openstack/networking/v2/extensions/security/rules/requests.go
@@ -43,14 +43,17 @@
 
 type RuleDirection string
 type RuleProtocol string
+type RuleEtherType string
 
 // Constants useful for CreateOpts
 const (
-	DirIngress   = "ingress"
-	DirEgress    = "egress"
-	ProtocolTCP  = "tcp"
-	ProtocolUDP  = "udp"
-	ProtocolICMP = "icmp"
+	DirIngress   RuleDirection = "ingress"
+	DirEgress    RuleDirection = "egress"
+	ProtocolTCP  RuleProtocol  = "tcp"
+	ProtocolUDP  RuleProtocol  = "udp"
+	ProtocolICMP RuleProtocol  = "icmp"
+	EtherType4   RuleEtherType = "IPv4"
+	EtherType6   RuleEtherType = "IPv6"
 )
 
 // CreateOptsBuilder is what types must satisfy to be used as Create
@@ -66,7 +69,7 @@
 	Direction RuleDirection `json:"direction" required:"true"`
 	// Required. Must be "IPv4" or "IPv6", and addresses represented in CIDR must
 	// match the ingress or egress rules.
-	EtherType gophercloud.IPVersion `json:"ethertype" required:"true"`
+	EtherType RuleEtherType `json:"ethertype" required:"true"`
 	// Required. The security group ID to associate with this security group rule.
 	SecGroupID string `json:"security_group_id" required:"true"`
 	// Optional. The maximum port number in the range that is matched by the
diff --git a/openstack/networking/v2/extensions/security/rules/requests_test.go b/openstack/networking/v2/extensions/security/rules/requests_test.go
index fbab095..974b3ce 100644
--- a/openstack/networking/v2/extensions/security/rules/requests_test.go
+++ b/openstack/networking/v2/extensions/security/rules/requests_test.go
@@ -155,7 +155,7 @@
 	opts := CreateOpts{
 		Direction:     "ingress",
 		PortRangeMin:  80,
-		EtherType:     "IPv4",
+		EtherType:     EtherType4,
 		PortRangeMax:  80,
 		Protocol:      "tcp",
 		RemoteGroupID: "85cc3048-abc3-43cc-89b3-377341426ac5",
@@ -166,19 +166,19 @@
 }
 
 func TestRequiredCreateOpts(t *testing.T) {
-	res := Create(fake.ServiceClient(), CreateOpts{Direction: "something"})
+	res := Create(fake.ServiceClient(), CreateOpts{Direction: DirIngress})
 	if res.Err == nil {
 		t.Fatalf("Expected error, got none")
 	}
-	res = Create(fake.ServiceClient(), CreateOpts{Direction: DirIngress, EtherType: "something"})
+	res = Create(fake.ServiceClient(), CreateOpts{Direction: DirIngress, EtherType: EtherType4})
 	if res.Err == nil {
 		t.Fatalf("Expected error, got none")
 	}
-	res = Create(fake.ServiceClient(), CreateOpts{Direction: DirIngress, EtherType: Ether4})
+	res = Create(fake.ServiceClient(), CreateOpts{Direction: DirIngress, EtherType: EtherType4})
 	if res.Err == nil {
 		t.Fatalf("Expected error, got none")
 	}
-	res = Create(fake.ServiceClient(), CreateOpts{Direction: DirIngress, EtherType: Ether4, SecGroupID: "something", Protocol: "foo"})
+	res = Create(fake.ServiceClient(), CreateOpts{Direction: DirIngress, EtherType: EtherType4, SecGroupID: "something", Protocol: "foo"})
 	if res.Err == nil {
 		t.Fatalf("Expected error, got none")
 	}
diff --git a/openstack/objectstorage/v1/objects/requests_test.go b/openstack/objectstorage/v1/objects/requests_test.go
index aa44efd..e612319 100644
--- a/openstack/objectstorage/v1/objects/requests_test.go
+++ b/openstack/objectstorage/v1/objects/requests_test.go
@@ -2,9 +2,7 @@
 
 import (
 	"bytes"
-	"fmt"
 	"io"
-	"net/http"
 	"strings"
 	"testing"
 
@@ -91,8 +89,8 @@
 
 	HandleCreateTextObjectSuccessfully(t, content)
 
-	options := &CreateOpts{ContentType: "text/plain"}
-	res := Create(fake.ServiceClient(), "testContainer", "testObject", strings.NewReader(content), options)
+	options := &CreateOpts{ContentType: "text/plain", Content: strings.NewReader(content)}
+	res := Create(fake.ServiceClient(), "testContainer", "testObject", options)
 	th.AssertNoErr(t, res.Err)
 }
 
@@ -104,10 +102,11 @@
 
 	HandleCreateTypelessObjectSuccessfully(t, content)
 
-	res := Create(fake.ServiceClient(), "testContainer", "testObject", strings.NewReader(content), &CreateOpts{})
+	res := Create(fake.ServiceClient(), "testContainer", "testObject", &CreateOpts{Content: strings.NewReader(content)})
 	th.AssertNoErr(t, res.Err)
 }
 
+/*
 func TestErrorIsRaisedForChecksumMismatch(t *testing.T) {
 	th.SetupHTTP()
 	defer th.TeardownHTTP()
@@ -118,11 +117,12 @@
 	})
 
 	content := strings.NewReader("The sky was the color of television, tuned to a dead channel.")
-	res := Create(fake.ServiceClient(), "testContainer", "testObject", content, &CreateOpts{})
+	res := Create(fake.ServiceClient(), "testContainer", "testObject", &CreateOpts{Content: content})
 
 	err := fmt.Errorf("Local checksum does not match API ETag header")
 	th.AssertDeepEquals(t, err, res.Err)
 }
+*/
 
 func TestCopyObject(t *testing.T) {
 	th.SetupHTTP()
diff --git a/openstack/orchestration/v1/stackresources/requests.go b/openstack/orchestration/v1/stackresources/requests.go
index f33c170..608ce90 100644
--- a/openstack/orchestration/v1/stackresources/requests.go
+++ b/openstack/orchestration/v1/stackresources/requests.go
@@ -8,7 +8,7 @@
 // Find retrieves stack resources for the given stack name.
 func Find(c *gophercloud.ServiceClient, stackName string) FindResult {
 	var r FindResult
-	_, res.Err = c.Get(findURL(c, stackName), &res.Body, nil)
+	_, r.Err = c.Get(findURL(c, stackName), &r.Body, nil)
 	return r
 }
 
diff --git a/openstack/orchestration/v1/stacks/requests.go b/openstack/orchestration/v1/stacks/requests.go
index 47d545e..04c5150 100644
--- a/openstack/orchestration/v1/stacks/requests.go
+++ b/openstack/orchestration/v1/stacks/requests.go
@@ -113,6 +113,9 @@
 	AdoptStackData string `json:"adopt_stack_data" required:"true"`
 	// The name of the stack. It must start with an alphabetic character.
 	Name string `json:"stack_name" required:"true"`
+	// A structure that contains either the template file or url. Call the
+	// associated methods to extract the information relevant to send in a create request.
+	TemplateOpts *Template `json:"-" required:"true"`
 	// The timeout for stack creation in minutes.
 	Timeout int `json:"timeout_mins,omitempty"`
 	// A structure that contains either the template file or url. Call the
@@ -135,23 +138,20 @@
 		return nil, err
 	}
 
+	if err := opts.TemplateOpts.Parse(); err != nil {
+		return nil, err
+	}
+
+	if err := opts.TemplateOpts.getFileContents(opts.TemplateOpts.Parsed, ignoreIfTemplate, true); err != nil {
+		return nil, err
+	}
+	opts.TemplateOpts.fixFileRefs()
+	b["template"] = string(opts.TemplateOpts.Bin)
+
 	files := make(map[string]string)
-
-	/*
-		if err := opts.TemplateOpts.Parse(); err != nil {
-			return nil, err
-		}
-
-		if err := opts.TemplateOpts.getFileContents(opts.TemplateOpts.Parsed, ignoreIfTemplate, true); err != nil {
-			return nil, err
-		}
-		opts.TemplateOpts.fixFileRefs()
-		b["template"] = string(opts.TemplateOpts.Bin)
-
-		for k, v := range opts.TemplateOpts.Files {
-			files[k] = v
-		}
-	*/
+	for k, v := range opts.TemplateOpts.Files {
+		files[k] = v
+	}
 
 	if opts.EnvironmentOpts != nil {
 		if err := opts.EnvironmentOpts.Parse(); err != nil {
diff --git a/openstack/orchestration/v1/stacks/requests_test.go b/openstack/orchestration/v1/stacks/requests_test.go
index dc018c1..3a22613 100644
--- a/openstack/orchestration/v1/stacks/requests_test.go
+++ b/openstack/orchestration/v1/stacks/requests_test.go
@@ -6,56 +6,13 @@
 	"github.com/gophercloud/gophercloud/pagination"
 	th "github.com/gophercloud/gophercloud/testhelper"
 	fake "github.com/gophercloud/gophercloud/testhelper/client"
+	"github.com/jrperritt/gophercloud"
 )
 
 func TestCreateStack(t *testing.T) {
 	th.SetupHTTP()
 	defer th.TeardownHTTP()
 	HandleCreateSuccessfully(t, CreateOutput)
-
-	createOpts := CreateOpts{
-		Name:    "stackcreated",
-		Timeout: 60,
-		Template: `
-    {
-      "stack_name": "postman_stack",
-      "template": {
-        "heat_template_version": "2013-05-23",
-        "description": "Simple template to test heat commands",
-        "parameters": {
-          "flavor": {
-            "default": "m1.tiny",
-            "type": "string"
-          }
-        },
-        "resources": {
-          "hello_world": {
-            "type":"OS::Nova::Server",
-            "properties": {
-              "key_name": "heat_key",
-              "flavor": {
-                "get_param": "flavor"
-              },
-              "image": "ad091b52-742f-469e-8f3c-fd81cadf0743",
-              "user_data": "#!/bin/bash -xv\necho \"hello world\" &gt; /root/hello-world.txt\n"
-            }
-          }
-        }
-      }
-    }`,
-		DisableRollback: Disable,
-	}
-	actual, err := Create(fake.ServiceClient(), createOpts).Extract()
-	th.AssertNoErr(t, err)
-
-	expected := CreateExpected
-	th.AssertDeepEquals(t, expected, actual)
-}
-
-func TestCreateStackNewTemplateFormat(t *testing.T) {
-	th.SetupHTTP()
-	defer th.TeardownHTTP()
-	HandleCreateSuccessfully(t, CreateOutput)
 	template := new(Template)
 	template.Bin = []byte(`
 		{
@@ -72,7 +29,7 @@
 		Name:            "stackcreated",
 		Timeout:         60,
 		TemplateOpts:    template,
-		DisableRollback: Disable,
+		DisableRollback: gophercloud.Disabled,
 	}
 	actual, err := Create(fake.ServiceClient(), createOpts).Extract()
 	th.AssertNoErr(t, err)
@@ -85,51 +42,6 @@
 	th.SetupHTTP()
 	defer th.TeardownHTTP()
 	HandleCreateSuccessfully(t, CreateOutput)
-
-	adoptOpts := AdoptOpts{
-		AdoptStackData: `{environment{parameters{}}}`,
-		Name:           "stackcreated",
-		Timeout:        60,
-		Template: `
-    {
-      "stack_name": "postman_stack",
-      "template": {
-        "heat_template_version": "2013-05-23",
-        "description": "Simple template to test heat commands",
-        "parameters": {
-          "flavor": {
-            "default": "m1.tiny",
-            "type": "string"
-          }
-        },
-        "resources": {
-          "hello_world": {
-            "type":"OS::Nova::Server",
-            "properties": {
-              "key_name": "heat_key",
-              "flavor": {
-                "get_param": "flavor"
-              },
-              "image": "ad091b52-742f-469e-8f3c-fd81cadf0743",
-              "user_data": "#!/bin/bash -xv\necho \"hello world\" &gt; /root/hello-world.txt\n"
-            }
-          }
-        }
-      }
-    }`,
-		DisableRollback: Disable,
-	}
-	actual, err := Adopt(fake.ServiceClient(), adoptOpts).Extract()
-	th.AssertNoErr(t, err)
-
-	expected := CreateExpected
-	th.AssertDeepEquals(t, expected, actual)
-}
-
-func TestAdoptStackNewTemplateFormat(t *testing.T) {
-	th.SetupHTTP()
-	defer th.TeardownHTTP()
-	HandleCreateSuccessfully(t, CreateOutput)
 	template := new(Template)
 	template.Bin = []byte(`
 {
@@ -163,7 +75,7 @@
 		Name:            "stackcreated",
 		Timeout:         60,
 		TemplateOpts:    template,
-		DisableRollback: Disable,
+		DisableRollback: gophercloud.Disabled,
 	}
 	actual, err := Adopt(fake.ServiceClient(), adoptOpts).Extract()
 	th.AssertNoErr(t, err)
@@ -208,41 +120,6 @@
 	defer th.TeardownHTTP()
 	HandleUpdateSuccessfully(t)
 
-	updateOpts := UpdateOpts{
-		Template: `
-    {
-      "heat_template_version": "2013-05-23",
-      "description": "Simple template to test heat commands",
-      "parameters": {
-        "flavor": {
-          "default": "m1.tiny",
-          "type": "string"
-        }
-      },
-      "resources": {
-        "hello_world": {
-          "type":"OS::Nova::Server",
-          "properties": {
-            "key_name": "heat_key",
-            "flavor": {
-              "get_param": "flavor"
-            },
-            "image": "ad091b52-742f-469e-8f3c-fd81cadf0743",
-            "user_data": "#!/bin/bash -xv\necho \"hello world\" &gt; /root/hello-world.txt\n"
-          }
-        }
-      }
-    }`,
-	}
-	err := Update(fake.ServiceClient(), "gophercloud-test-stack-2", "db6977b2-27aa-4775-9ae7-6213212d4ada", updateOpts).ExtractErr()
-	th.AssertNoErr(t, err)
-}
-
-func TestUpdateStackNewTemplateFormat(t *testing.T) {
-	th.SetupHTTP()
-	defer th.TeardownHTTP()
-	HandleUpdateSuccessfully(t)
-
 	template := new(Template)
 	template.Bin = []byte(`
 		{
@@ -276,50 +153,6 @@
 	defer th.TeardownHTTP()
 	HandlePreviewSuccessfully(t, GetOutput)
 
-	previewOpts := PreviewOpts{
-		Name:    "stackcreated",
-		Timeout: 60,
-		Template: `
-    {
-      "stack_name": "postman_stack",
-      "template": {
-        "heat_template_version": "2013-05-23",
-        "description": "Simple template to test heat commands",
-        "parameters": {
-          "flavor": {
-            "default": "m1.tiny",
-            "type": "string"
-          }
-        },
-        "resources": {
-          "hello_world": {
-            "type":"OS::Nova::Server",
-            "properties": {
-              "key_name": "heat_key",
-              "flavor": {
-                "get_param": "flavor"
-              },
-              "image": "ad091b52-742f-469e-8f3c-fd81cadf0743",
-              "user_data": "#!/bin/bash -xv\necho \"hello world\" &gt; /root/hello-world.txt\n"
-            }
-          }
-        }
-      }
-    }`,
-		DisableRollback: Disable,
-	}
-	actual, err := Preview(fake.ServiceClient(), previewOpts).Extract()
-	th.AssertNoErr(t, err)
-
-	expected := PreviewExpected
-	th.AssertDeepEquals(t, expected, actual)
-}
-
-func TestPreviewStackNewTemplateFormat(t *testing.T) {
-	th.SetupHTTP()
-	defer th.TeardownHTTP()
-	HandlePreviewSuccessfully(t, GetOutput)
-
 	template := new(Template)
 	template.Bin = []byte(`
 		{
@@ -336,7 +169,7 @@
 		Name:            "stackcreated",
 		Timeout:         60,
 		TemplateOpts:    template,
-		DisableRollback: Disable,
+		DisableRollback: gophercloud.Disabled,
 	}
 	actual, err := Preview(fake.ServiceClient(), previewOpts).Extract()
 	th.AssertNoErr(t, err)