Looks good and passes tests. Amended commit and force-pushed to branch as 3f56f23