Adding Andrew's files to package