work-in-progress refactor of davidl.github.com