base code working, data needs populating