Finish Demo app (add scaffold's)