Commit of prototype code

Doesn't work very well