For some reason the latest pull I did from Mike's commit removed changes I had made to these files. I manually went into the previous commit and copied the code from that commit into the files in the current repo. Those changes are being commited again here. Hopefully, we won't run into this problem again.