#24 creating entity, changing querys @salometsiramua