IT WORKS! Now I'm making it better