Split out specs, fix nested FUNCs