forgot to upload properties and new helper class in previous commit