upgraded to latest sshoogr + added some todos