initial commit
farinas changes commited
Farina requests pt 2.