Got some work redone
Merge pull request #3 from joeuguce99/workingmaster

Got some work redone