Started refactoring for star assignment