Continue user testing

See commit 
@tliounyc check this branch before merging