still fixing around! 60% done