UPdated specs, added typeouts.