exception test passing. initial changes to types

I commented out stuff that doesn't compile. Starting an ongoing PR for review.