Trying to fix the hot mess this project has become. Not much progress so far.