forgoten debug
rewriten common entities into separate objects