Added some code for starmap generation (early days)