Merge the 2m reminders with the asy file, finish the initial pass at making labels and some better colours