Final prepration commit.
Major code changes complete, ready for implementation of unique effects.