Need to add a duration cap
Adding support for more environments