Added some new helpers and implementing Omers idea
got it to 0.75