Feature/bceastburn/rearrangementlistener