some updates to the code...  Working.