Refactored entities, added gritter messaging