Dialog working. Cleaning up.