Finished star collapse

There's a merge commit in there that shouldn't be, but, not much I can do