Intermediate commit

Not fully working yet