Adding stuff from our frantic hacking