Finishing chapter two and app demo