Initial working commit

This is a initial working commit