Many changes. Yes I know that I need to have better commit messages