Version 1.1

Modified the 'while' statements to if, but we will see what would happen
next. Not finished.