Redid implementation, API has changed. Much clearer now.
Merge remote-tracking branch 'origin/master'