Clean up. Added toast. Don't love the API yet, but it's there.