started separating ETH and TAP code