Start making mesh builder a bit more general