Bunch of changes. Getting closer