Fully Broke Out Generic Circuits. Cleaned up Initialization Code.