Underlying architecture revamped. oops...

I suppose we can always go back a version if needed.