Completed Makers export. Please test before we merge into master!