Rewrote entire swing report implementation