Second Commit.  Changed Some things around.