First commit from IDEA.
Just basica changes.