New Code
Off by one error.  Almost complete.