Last commit before abandoning the idea