Feature/end state implementation

It can be omitted safely: the if block would be handy for declaring something like creator_opts, where you want the creator_opts declaration only if there are opts to fill in, but want it left out if you don't. Hope that makes sense.