switch to latest grape + implement multiple enteties