Made some more API changes. Getting close to finishing high-level review.