Overhaul now that I can use actual API.