Updated code so it tests out so far.