Moved Gene Statement saving code to gene module