Initial work

Could use a for loop here, and get rid of the iterator? Save some lines of code.