initial commit with removal of swaps and new citation class