Many more changes
pretty close to being done, need to proof read it again