Stil needs some work but getting there.
Made some changes here too.