Work toward being slightly more APIlike.

Also, final EVERYTHING.