Updating to make cleaned up version reflect all current changes

I'll reintegrate the changes that have been made to work around the modularized version.