Whoops. Missed some docs and cleanup :)