Updates/ still need do change...

Still need to finish Edit. I inserted some comments to help.