Changes made, almost working.