Completed basic 21 question functionality