initial working commit
fixed