merged kevin's stuff w mariano's project