Quick and dirty code dump for #19