Added missing until loop
Added WIP disclaimer