Complete 1st pass at sample app