real updates
Merge pull request #2 from wschorn/mockup

real updates - a mockup!