Working and intial commit