WIP - getting rid of base/base.go