Swapaxes

Rebased my commits