major post-feedback refactor: $promise, double quotes