initial commit of work done locally
Merge pull request #1 from gimbel0893/master

here's what i got