Sweeper 36 & 37

36 & 37 now work. Legacy: 33, 34 still are having problems.