Starting to work on Number. Making passing components more general