re-organization and clenup. Incomplete clip support