Made a lot of progress. Hacky progress. But progress.