Cleaning up. Not sure if doing BEFORE_ALL in ctor is appropriate. May go back to using bool.