Completed preliminary mock data implementation