Add capsuleGroup and abstract things a little better
Update to trigger auto deploy
Merge remote-tracking branch 'origin/master'