Add taker branch

from local forks