Added until loop. Still working on it...