moving things around, trying to define APIs (build is broken)