Adding in files from Great-Machine.