Started work upgrading to evm3. Removed multi support for simplification purposes