Some additions to base.go.  More practice.