Added a bunch of things another function and now is completly dictionary based.