- Implementatie Entity

Tests don't pass. No logger?