adds basic new slave and new master handling