Decided to start entity code from scratch