Minor Update. main code still WIP.