Feature/entity audit

Entity Audit ready for QA.