Reformatting. Added Water entity. Removed image argument on entities.