major update, late commit.

Hopefully this works.