Almost done. Small fixes needed