Cleaned up and working!!!!! No more mess :)