Start on normalizing stars
fix conflicts
Normalize coordinates