Still working on high level architecture
Merge branch 'dev' of github.com:gbonnema/xmas into dev