getting specs to pass, changing some stuff to hg instead of git