Added plan to split envionments out to own module