Clean drop with support for Textbox, with the rename, unit and some functional tests.