write all code
Merge pull request #3 from Roenke/all-work

write all code