darn swaps
fix git stuff