mam: WIP on submissions
Working step + tests both for FF and FF++, yay!