Add initial shepherding tool and update to latest version of screens