Finishing up demo app