Fixed major error

Everything was duped.  There were two copies of the code...