Most recent hackings before moving to ocaml version
Random hacking