A lot of change
second commit - almost viable