fisxing merge issues
starting to add fake data