Further completed the pending implementation, updated the sample data to work with it