Cleaning up #17. Started work on #22