started entity refactor