First version commit
Adding what's left