some more reorging
merging
Merge branch 'master' of https://github.com/ericmercer/uber-lazy