Less gross, more api