Integration

Integration between mine and Peter’s files for project