Integrated waffle.io - closes #12