Finish demo app
Second commit
4
final