To mitigate side-channel attacks (SCAs), we propose to further develop asynchronous circuit CAD flows. We will develop a simple set of tools for asynchronous circuit synthesis and optimization that fit into standard CAD flows. The tools will leverage existing automatic asynchronous circuit layout generators (provided). We will test our flow and tools on several existing benchmark circuits.