90Percent Completed

Have to clean the code