Merge in a lot of code from menutest1