Almost done. Need to touch up somethings