Needed commit

Would produce conflicts if i did not, not finished the work here yet.