Refactoring Data
Post refactor
temp
entity headache