Things working decently, but abandoning this branch for a while.