Working on #9. More stable now