final updates!!!!!!!
trying to make this work push the final changes please