Work on API and look & feel.