Made current version compilable. Working.