Major refactors since the major API update in April.