Initial commit of gaenv rewrite