Incremental checkin, still don't have functionality for persisting drag and drop behavior