more cutting up. Can't compile yet