Working on initial implementation with demo data