updates, nearly there

almost entirely scalable