merging fully implemented and echos commented out