Lots of Changes

Almost got this all working, everything is formatted correctly, just
need to fix normalizing.