Done it. Scratch rewrite & Entity Class