Rewrote Dictionary as Dictionary2

Complete rewrite of dictionary trying to make less Complicated.
pivot has not yet been rewritten