+1 and +2 done.
transposition. Compiles but need a bit of work.