Issue #4 resolved, user input reordered

Closes #4