Added swap testing and clearing stuff