routine tweaks
Merge branch 'master' of github.com:sstucki/odds
quick and dirty lazy models, lots of dup with old stuff