Expand: starmapBuilder

Working on supply and demand