Re-arranged in preparation for doing starmap
A start on mapping stars