Merge of D20 app
Now accept user input