POC for issue #4

POC. Not refactored, but what I'm thinking about