Clean up. Added time. Multiple entities.