Basic Edit and Connectivity - partially working