Added a loop but need to fix notes etc.