Added Brett's files/changes