Merge, improved TextBox, started on binding framework