mostly written but needs IF check
Merge branch 'master' of github.com:bpetrin/morning-coffee