Finish Base Work

Complete the base work of demo app